Adwaita: Special-case server-side window decorations

The WM already adds the window shadow in that case, so just use the
box-shadow to add the border here.

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 2587c87dfd315545c829f1a1eb9c071aa7b3255f..886583eba25912abe6be8e856b2be46b7087668b 100644 (file)
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -3176,6 +3176,10 @@ GtkVolumeButton.button { padding: 8px; }
   &.popup {
     box-shadow: none;
   }
+  // server-side decorations as used by mutter
+  &.ssd {
+    box-shadow: 0 0 0 1px $_wm_border; //just doing borders, wm draws actual shadows
+  }
   &.csd {
     .popup {
       border-radius: 0;

diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index dbed75652bad8ce1dc1f04864e2b8f4ef5e44edc..1327d3a39220ad8f6dc4403e29125f3809bbf9c8 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -4304,6 +4304,8 @@ GtkVolumeButton.button, .header-bar GtkVolumeButton.button.titlebutton,
     border-radius: 0; }
   .window-frame.popup {
     box-shadow: none; }
+  .window-frame.ssd {
+    box-shadow: 0 0 0 1px rgba(28, 31, 31, 0.9); }
   .window-frame.csd .popup {
     border-radius: 0;
     box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(28, 31, 31, 0.8); }

diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index f6e9e780c88ee1fed7e108648bb360ce5233f77c..acd462d523fdf025d349060ea74f873a70650529 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -4474,6 +4474,8 @@ GtkVolumeButton.button, .header-bar GtkVolumeButton.button.titlebutton,
     border-radius: 0; }
   .window-frame.popup {
     box-shadow: none; }
+  .window-frame.ssd {
+    box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.23); }
   .window-frame.csd .popup {
     border-radius: 0;
     box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.13); }